Merge.
authorAlan Mackenzie <acm@muc.de>
Wed, 11 Jan 2012 22:32:50 +0000 (22:32 +0000)
committerAlan Mackenzie <acm@muc.de>
Wed, 11 Jan 2012 22:32:50 +0000 (22:32 +0000)

Trivial merge